filechooserwidget: Drop usage of gtk_search_entry_handle_event()
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 3 Apr 2019 11:16:49 +0000 (13:16 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Wed, 3 Apr 2019 11:23:34 +0000 (13:23 +0200)
Just use gtk_event_controller_key_forward() to let know the search
entry of the Esc key being pressed.

gtk/gtkfilechooserwidget.c

index dc5bab6176570b7e21f38a0545579e7ed3fee7f5..988df4ba31e3174c7deadc98846c1d42f6ee1748 100644 (file)
@@ -1318,11 +1318,11 @@ should_trigger_location_entry (GtkFileChooserWidget *impl,
  * pressed.
  */
 static gboolean
-key_press_cb (GtkEventController *controller,
-              guint               keyval,
-              guint               keycode,
-              GdkModifierType     state,
-              gpointer            data)
+key_press_cb (GtkEventControllerKey *controller,
+              guint                  keyval,
+              guint                  keycode,
+              GdkModifierType        state,
+              gpointer               data)
 {
   GtkFileChooserWidget *impl = (GtkFileChooserWidget *) data;
   GtkFileChooserWidgetPrivate *priv = impl->priv;
@@ -1378,8 +1378,8 @@ key_press_cb (GtkEventController *controller,
   if (keyval == GDK_KEY_Escape &&
       priv->operation_mode == OPERATION_MODE_SEARCH)
     {
-      gtk_search_entry_handle_event (GTK_SEARCH_ENTRY (priv->search_entry), (GdkEvent *)event);
-      return GDK_EVENT_STOP;
+      return gtk_event_controller_key_forward (controller,
+                                               gtk_search_entry_get_text_widget (GTK_SEARCH_ENTRY (priv->search_entry)));
     }
 
   return GDK_EVENT_PROPAGATE;